code cleanup based on sonar
fixed rolling log issue