Minor changes/PEP8