Cleaned up some updating logic