Restructured a bit.