Refactoring names and removing unused