Just a couple polishing touches