Fixed immutable fields non-final status and some redundant modifiers.