Moved values from constanst.h

Just a small update to a few files, to remove values from constants.h