Completed Cells Specs and little bit of refactoring