Remove unnecessary list()s and some PEP8