Clean up readme and code