Code standards
Extracted logging access
Code standards