comments & tidiness