optimize code, do more readable logs