Refactor to better define points