comment & cleanup