Minor improvements towards conformity to coding conventions