PEP8 compliance and sorted all names