comments & rename