Code review changes and style fix