Update and cleanup
Updated readme