Cleaned up AngryDroids