Small cleanup and a few more modules