Lint, indentation, minor formatting fixes

There's still an issue with the code, I've started a discussion [here](https://github.com/saltstack/salt/commit/3dfd6f07e51bda98851d42f0b5601cc870394f5d#commitcomment-4198845) to get it properly fixed.