Cleanup of code
Updated readme