Made all constants into static fields