Moved utilities into private namespace