coding standards

Running my autocorrection sniffer over it corrected the following cs issues.
Also minor cleanup.