Tidy up

Improve function names
Remove console logging
Remove Set class