Aesthetic change towards idiomatic scala