Removing clutter and renaming props. Moving some property setting to getter methods.