minor cleanup and run hasEnter till the end