Refactoring valuestracker class.