Refactoring renaming, deleted unused data