Reorganized a little bit