stylistic fixes.

(Also commented out code that isn't ready yet).

Should probably figure out a better way to handle the @@manager class
variable in runner