Improve Code Quality by following codeguide.