Move several methods into Utils.cs