Cleanups

Just a few things. 

Thanks for keeping this lib up-to-date