Refactor simple statements