Cleanup, refactored cell separator hiding into cell subclasses