Applying fixes suggested by ScrutinizerCI
ScrutinizerCI badge added