Code cleanup, wait for interrupt to clear when starting move