Minor style code style changes