Code improvements / cleanup and switching to ARC for the Current Location ES