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