Cleaning up muddied commit