Changed properties to be more readable