Improve coding style & performances