Added not tested refactoring - written in GitHub's edition