housekeeping ready for next part of refactoring