Clean up a few comments, use path.join for output folder