separated model data from views
cleanup