Rewrote properties in a much more readable format.