Cleanup

resolves issues #5 #6 and #7 
I think there's an extra, unneeded pair of parens in the `map()` call (and same in "add" & "delete").