Commit amended for code style by Adam Honse <calcprogrammer1@gmail.com>
Commit amended for code style and to squash commits by Adam Honse <calcprogrammer1@gmail.com>