Update code according to linter report