Spellcheck and linty cleanups