Consistently use brackets rather than slashes for long lines
Parameter indentation PEP8 fixes
Fix some PEP8 inconsistancies

Fixes #202