Pass key to KeyError instances
Remove ide auto-spacing of assignment