Cleanups

I gave you access to my fork fwiw, or if you want to grant me access to yours I'm happy to push there.