Adding some polish