Code cleanup
Updated readme