DEV-126 | Fix foodcritic violations when upgrade