Some cosmetic changes to get diff readable