Indentation seems a bit wrong here. I use tabs to indent, I know that differs from PEP8 and maybe we should conform to that, but lets just keep it consistent right now and use tabs for indentation and spaces for alignment.