Fix LINT errors. Mostly whitespace, but it actually fixed a bug, concerning reused variables (go LINT).