Version 0.3

Cleaning up a little more