branch logic noise in PointsEntry form is reduced.
apply refactoring to other controllers