Basic clean-up
Refactor out Sugar query basics to a helper class.
Springify Sugar query classes.