enhance comments and log