Cleaning things up a bit. Ready for a v0.0.1 tag