Updated readme and cleanup