Improve removing inside of lists
Make removal code more legible