Code tidy up while in the area.