Added toggle method, renamed methods, removed unnecessary check in remove