clean up and use rel path