cleanup/beautify