Make removal code more legible