Created separate helpers class. Removed logging