add() improvements

Refactoring and cleanup, store will be changed with next commit to
enhance readability. Remove() will be underway as well.