moving on ...
miscellaneous *
continued refactoring *