[FIX] Refactoring leftovers