Cleaned up some EnergyCold code