Clean, with small niceties included