Refactored and tested method calculations