cleaning up
moving modeling