struct coding style cleanup