Ned/pylint fixes

A handful of changes directed by pylint scolding. @cpennington ?