Some smftidy cleanup, and added a method to check that the payload is the correct arch when using the powershell method