Amended for code style by Adam Honse <calcprogrammer1@gmail.com>
Commits amended and squashed by Adam Honse <calcprogrammer1@gmail.com>