Improve coding standards