Fix: Better format