Cleanup and spellcheck
cleanup