Commits squashed and amended for code style by Adam Honse <[email protected]>
Commit amended for code style by Adam Honse <[email protected]>