improve coding style