more coding style changes