Changes to apply right coding style