added convention changes from code review, and updated tracker stub to remove confusing use of context && window