Refactor statements