Fix language specific section and remove annoying extra whitespace