Cleanup and add Scala example.