[TASK] Little Refactoring