Adding some quick polish