clean up and comments for tracking module