Reorganized things slightly