Statement refactor