Some cleanup and an update to README