Don't overprune the key
Style cleanup