inor refactoring