Improve logger
Fix improper naming