Refactoring dynamic's app