Cleanup

- Code Cleanup
- Readme Updates