Fix spelling and some cosmetics