comments & cleanup