some refactoring and cleanup of the pxe.pp bits