Updated coding style