Refactoring 1
Increase in efficiency of calculation