Fix typo and a minor code style tweak