Makes ESLint happy; follows Stroustrup brace style, various small cleanups.
Makes ESLint happy; follows Stroustrup brace style, various small cleanups.

svozza/highland,caolan/highland,kwangkim/highland,Whoaa512/highland,jgrund/highland,dayoadeyemi/highland,kwangkim/highland,vqvu/highland,icio/highland,quarterto/highland,icio/highland,Whoaa512/highland,dayoadeyemi/highland,surgeforward/highland,svozza/highland,megawac/highland,megawac/highland,surgeforward/highland,kjvalencik/highland,Andolamin/highland,caolan/highland,kjvalencik/highland,vqvu/highland,jgrund/highland,Andolamin/highland