Some cleanup and working fitting