SFD-12

Addressing review comments.