more changes to refactoring