Use a more functional style with only one simple, general callable struct

Use a more functional style with only one simple, general callable struct #44