Code Cleanup: First Pass

Fix: random line breaks, duplicate commands, whitespace, minor
organization, indentation, and semicolons
Merge pull request #8 from sirDonovan/master

Code Cleanup - Ty, Dono