Commit amended for code style by Adam Honse <[email protected]>
Commit amended for code style and to squash commits by Adam Honse <[email protected]>