More Code Style changes

Mostly based on PEP 8 suggestions.
Unified procedures so their arguments are similarly formatted.