fixup: cleanup wishes by @opdenkamp