Fixed some indentation and argument ordering issues, removed pdb from the file