further cleaning/organization for Fiji setup