Correct commit with refactoring