statements refactoring