more progress on refactoring