move utils into own module