making some progress in refactoring