Changed member properties to clarify their purpose.