Migrated a majority of calls to get and set property to proper properties