Cleanup pylint errors
Lint cleanup