Minor changes and cleanups made during XISF development