Add some comments and use i8n