Some cleanup from playing around
Merge pull request #1 from subbuss/cleanup

Some cleanup from playing around