0.9.0

Initial clean up code