refactor statements