Magic number cleanup