Refactor #114.scala
Solve #115 in scala