More cleaning up of AreaData class