Cleaning up code base. Normalizing property refs.