Update to account for new system image location

And reformat for legibility