Minor class movements and cleanups