Add RemoveByID
format tunning