Commit amended for code style and minor cleanup by Adam Honse <calcprogrammer1@gmail.com>
Commit amended for code style and to remove unrelated changes by Adam Honse <calcprogrammer1@gmail.com>