Prefer names to numbers in storm code