Cleaned up Location Listener Model