Minor cleanup and comment improvements