Ensure output is the same for both modes. Fix whitespace.