Area class refactoring