Fix useless spacing and other miscellany