Cleanup and fix relative path