Split long lines of code in few
Follow to previous commit