refactoring gor mig gladare an taget