Code review changes, style fix and test added