Removed unnecessary 'val' modifiers