code comment & cleanup