Minor update, cleanup