Make HasFourMomentum class smaller