Improve coding stadards