Code Cleanup
Updated README