cleanup
cleaned up sets a little