cleaning + skeletal CRUD work