Refactor point status