minor refactoring of primitive physics