Fix glitch and make update more readable