Ok, little clean-up. AsyncTask should be in one spot only now.