More refactoring to Pawn