Refactor point class to match naming of formula