refactor towards go_lint requirements