Removed mutable fields.

Also whitespace.