cleaner logging and a bit more
cleaner logging