Christian Koch
fix missing import, some cleanup
cc3c391