renaming: improving names and readability