Add comments, un-hardcode values of filenames