Whitespace and pylint-prodded cleanup for unused vars and columns in use