Made makeset more concise using sets