Minor cleanups, moving setup around, etc.