fixup! Remove match and fix make tidy problems