Added third evolution slot + cleaned up