refactoring suitcase