Some changes to coding style