Improved code from the Area class