Minor changes + PEP8 fix