Updated Readme and Code Cleanup