Is the addition of the moveHandler intentional?  That change gets lost with the white space changes.