Minor style changes and tests