codestandards cleanup galore

seriously, this is a bunch of changes that should change nothing