Cleaned up XiProgram