Code cleanup
commit before changing list return types to sets
Positive closure complete.