Grade school: introduce types for clarity