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