SA code cleanup and added type checking divider comment