Minor cleanup + better readme