fixing coding style issues