DP04, refactoring