Replacing uncommented literal numbers with constants and marking size fields as readonly