Fixing coding style issues