Minor clean up of #168 others will follow