cleanups and some more refactors