Small views cleanup.