code refactoring(#initialize, #match)