refactor code - fix move issue.
refactor code - fix track/follow issue, clean code also.