Magic number removal...