some fixes for coding style