made some values consts