More coding style cleanup