Refactor Physics Class