Autosizing cell refactor for cleanliness