Remove Magic Numbers