Cleanup Code

Cleanup code and update Readme