checked TODO related with renaming and making fields local