War on magic numbers
Some static buffer return goodies