name refactoring, removed unused code