Merge pull request #1 from brian-bot/master

syntax consistency and breaking out functions into individual files for better readability