comment clear-up