renaming. Some code improvement