Reorganized and removed extraneous stuff.