Cleanups and better README