Cleaned up pretty printing and added missing whitespace.