Implementing stylistic corrections

Additional corrections

More corrections