statement factoring

@nusqu