Code style enhancement