Code cleanup; added UIImage category