Some more scalafication