Minor fixes in code style
Modified some files to change code style