remove log message & add comments.