Style improved (imho)