Improve coding style