Clean up incorrect use of properties

to allow accessors to be used instead