Changes to Workbook to follow the official pattern
Changes to CellStyle to follow the official pattern