patch cleanup
git patch changes
code style further cleanup
merge