Minor update,clean up