Some code cleanup --- reduce line noise.