More cleanup/org stuff.