Improve coding style and grammar