Fix strings, style, tabulation code.

Fix strings, style, tabulation code and others minor change.