Added Caridy's suggested changes.