Hotfix/code inspection