utils cleanup and more options
todos cleanup with utils work