Commented and updated code format/style
Merge pull request #12 from JoshuaEstes/master

Commented and updated code format/style