final comment & cleanup