Continue grand cleanup, move items into util.hs