some more cleanliness. almost done with the enture structure.