Renaming key file; renaming string function; some reformatting.