refactor previous commit