Fix bug of istream/ostream ordering mismatch and make whitespace consistent…