Change println's to logger