Styling, getting close to PEP8