Bit more cleanup, grammar, etc.