Minor style & formatting fixes