Being less insane with if checks