More updates for code inspection