Tweak spelling config
Remove superfluous repeated code