Refactor of Mimi&Matt's Assignment