Less magic numbers, better text height