refactor remove/add to toggle
Merge pull request #1 from szymon-przybyl/patch-1

BUG-FIX refactor remove/add to toggle