coding style issues fixed