beautify code, cleanup