Improve coding standards
Improve coding standards