Scalacheck + refactor