cleanup #1, 40% done
cleanup #2: 50% done
cleanup: first cleanup finished
Merge branch 'master' into cleanup
Merge branch 'master' into cleanup
Merge branch 'master' into cleanup
more style fixes
Merge branch 'cleanup'
fixed one line length issue