Removed python 2.7 set syntax, moved back to set([...])