#1348 clean up code, fixing tabs, shortened comments on defaulthard option