Remove Config interface, define a struct instead
Rename variables/types, clean things up a wee bit