Reorganized things a bit.