DefaultActivity: some readability improvements