clean-up
some more modeling