some scalafication