Fix PEP8 issues, other minor changes