cleanup (and smaller minified)