Less magic numbers