Commit amended for code style and minor cleanup by Adam Honse <calcprogrammer1@gmail.com>
Commits squashed, code style and naming changes by Adam Honse <calcprogrammer1@gmail.com>