clean up and comments for tracking module
Merge pull request #3 from zzhang87/master

clean up and comments for tracking module