Make comments apply where they were meant to