Removed redundant line; name cleanup.