Improve cell.h formatting for real