git patch changes
code style further cleanup