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