Proper profile configuration
Refactoring resources