Style and language changes

Mostly style and language changes