VOLDEV-39: Code review changes