clean comments & format