Some code tidy up in MapsAppActivity