Additional style cleanups
visually located issues, cstyle.sh still shows none.