Refactored out CELL_ATOM