Reduce complexity via extract method
Merge branch 'master' of github.com:aztech-dev/dic-itools