Code style improve