fixed a problem of overusing yet not declaring constants