Cellex.blade clean up -- still could be neater