Clean the cal and fix arrow