Fix gosimple lint errors

When the lint runs on docker runner, there are additional errors due to the addition of the "gosimple" linter.

We should fix that and simplify our code :)