Refactor File.expand_path usage to remove additional File.join