Cleaning up some whitespace; will tidy up more later...