Restructuring and cleaning up a bit.