coding style cleanup