Changed code to meet scrutinizer-ci standards