Refactor File.expand_path usage to remove additional File.join

`File.join` might not be required when `File.expand_path` is being used, unless we want to make it work on windows. I feel that removing the extra `File.join` part simplifies the code. If there is actually an advantage of using File.join with expand_path, it would be good to know.