added some function decorators to make things a little neater.
cleaning and organizing in preparation for the cell modify features.