Reordered include quality and replace spaces