Minor grammer, code conventions fix