How to tidy up your set-system?