Update argument names for style
Extract cell directive template
Remove unused event unbindings