Hotfix/coding standard 2