Refactored set builder class a little