Use more path.join instead of +