Scrutinizer Code Quality

Fix the right Scrutinizer Code Quality.