rapidftr/tracker#28 refactor renamed a bunch of methods and variables