Refactoring to allow better use with ListViewAnimations