cleaning + comments