Reorganized a bit