Another coding style changes