Checkpoint 182000

My editor also felt like cleaning up some whitespace.