refactor and highlight in red