prepare for separation between default and other languages

plus tidy up and better spaceing