code review and model cleanup