code sections & logs consistency improvement