[FIX] Cleanup/Format