bit of cleanups around