More coding style changes