comments around necessary refactor