Refactoring in Scala