reorganized a bit