moved some stuff to an util module