Fixed scala style issues reported by Jenkins