Cleaning up in prep for 0.1 tag release ;)