refactor + scalakata api