Cleaned up MainActivity, added updateLocation service