Refactor 07-if-statements