As per PR comments from reviewer, fixing coding style.