Pythonifying

Cleaning up the code so that default values are set in the parameter
definition rather than in unnecessary lines of code that just confuse
what's going on.