Address the code inspection comments