Added logging best practices