Style cleanup round 2

I missed these whitespace/code style changes the first time around.

Also cleanup class prefix confusion.