some more refactoring from code review comments
some more refactoring from code review comments
some more refactoring from code review comments