split every statement into a method

also closes #63
update tests for new query builder