[FIX] Coding style cleanup - Wolfgang's suggestions