refactoring cell construction methods.