Refactored static functions into Calcs