Less ugly code