Minor source cleanup and commenting