Remove need for Difficult "magic numbers"