replaced magic values by with variables filled with magic values