Minor grammer, code conventions fix [ci skip]