Fixing coding style