cleanup according to suggestions