reorganized a little