Amended for code style by Adam Honse <[email protected]>
Commit amended to address review comments by Adam Honse <[email protected]>