Minor style fix
Code review fixes