Some code style issues fixed