PEP8 and styling fixes