Refactoring Spreadsheet controllers II.