Resolved AssignSideArea values to location + additional cleanup and helper methods