Fix: clean code