Commit amended for code style and minor cleanup by Adam Honse <[email protected]>
Commit amended for code style and to remove unrelated changes by Adam Honse <[email protected]>