Cleanup and rework of points