Minor changes
PEP 8 style and minor changes