update, some cleanup