chore: minor code cleanup

[tomiok]

_ remove re assignation in errors
_ do not use defer inside a for loop by extracting in other func
_ replace fmt.Errorf with errors.New since the err was only a string.