Part 3.2: Own additions: Refactoring for physical calculations