More renaming of variables and breaking up large methods.