refactoring && fix toInt bug in Track