0.2

Code Cleanup