Cleanup and use os.path.join