Codes style improve