more changes related to refactoring