re-organize for cleanliness
just a note