Commit amended for code style and minor cleanup by Adam Honse <[email protected]>
Commits squashed, code style and naming changes by Adam Honse <[email protected]>