CleanUp

Code cleanup, README