Convert to logger and renamed helper class