Amended for code style by Adam Honse <calcprogrammer1@gmail.com>
Commit amended to address review comments by Adam Honse <calcprogrammer1@gmail.com>