refactoring that was pending