Fix: some refactor