cleaning, improved logging format