spelling and some light cleaning