Cleanup + README update