Changed consts to use const instead of static