Minor refactoring, StatementBuilder in separate file