small refactor bit of cleanups