Refacto and more clearly code && git push origin master