remove blanks, and some code format