Refactor magnitudes