Some further coding style cleanup