Code convention small changes and English