Refactoring + playing further with gorp/sql