organized comments, added removeOr()