Moving to PyDev: Fixing some indentation (nightmare)