Classed it up a bit