Code refactoring (detail)