Fix white space to PEP8; delete unused variables