Polish up a bit