* some cleanup
* pep8 fix
fix #4065
fix pep8
Merge pull request #4078 from giantlock/develop

some cleanup for pillar module