Merge pull request #3 from snacsnoc/master

Formatting cleanup and some fixes