Update: function clean up