Refactoring and Precalc