remove callback function implemented, small code refactoring
implement enter and leave callbacks, config for add function