Resources realocation
Refactoring