Avoid unnecessary list
PEP8 compliance fixes