final touches to refactoring
4 files changed