move utils into module