Changes suggested by @laurocaetano