Pythonify source code a bit

Change indent according to PEP-8, ie 4 space.

Argument parsing is changed a bit to make it easier to read for Pythonistas.