Made more public ivars into private properties.