Update class names & closing comments