Move arrows and cleanups