Rework & rename calculate methods.