More "scalafication"

Search&Replace obvious mistakes like `abstract trait` and `return`