Trivial mods, fix typo and format