Refactoring of Gravity