Replaced accessor functions with the objects themselves