More refactoring of EditTrack.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
More refactoring

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>