Refactored the commented out code.
Added total sums for properties.