Fix: code cleanup