did some cleanup, moved some util stuff to utils, cleaned up prscm