Refactor motion formatters & add mag field