Minor style clean-up