Note about where to refactor