initial push
Code Cleanup