Refactoring
change