V 1.5

Code Cleanup