Refactor previous commit