+1 "Fix" is beyond "code cleanup"