removing pdb, small code review changes