little beautify/clean-up