Reorganized slightly