More scalafication of commands