Minor style-related changes