Comment as a reminder to refactor