Merge pull request #18 from b-dub25/master

syntax fixes and code clean up all around.