Applied some feedback from Dean and Thiago Macieira.