0.8.0

Code Cleanup