Random Cleanup
Merge pull request #6 from nwalters512/cleanup

Cleanup of code