Deleting extra files, adding comments, renaming vars to match their purpose