Cleaned up physics implementation