Follow PEP style recommendations
Add cleanup from PSE to address issues on Windows