renaming variable name and cleanup.