fix .remove()
optimize variable names