Code cleaning and Introduce Area data type