refactoring made me almost forget this bit of feedback