Some cleanup and using more of the _fn lib