Moved duplicate stuff to constants config file