Started moving out some stuff into new Utils class