Cleaned up update functions for CRAN submission