Cleaned up the process of switching between head variants