Clean up magic numbers