updated based on logging best practices