cleanup according to feedback