Addressing stylistic issues