minor refactoring of how points are returned