Sort out manifest so its more readable