Updated code to pass linter (with one exception; looking into).