cleanup, beautify stuff