Pull stuff out into util folder