I agree with this suggestion. It will be easier to make changes in the future and there are less lines of code.