refactoring due to inspection