Cleanup naming of files, add comments