reindent & code style