Completed some factoring and DbStatementBuilder