Style minor fixes