Clean up indentation, whitespace, and commented out code

The mis-indented code, extra newlines, and commented out code were
noticed while investigating the order dependent test failure fixed in
4365c8ba.

Reviewed-by: Max Martin <max@puppetlabs.com>