Some cleanup and an updated readme