various cleanup

Sorry about that. I have pushed an update.