add explicits and consts