Quality fixes
Addressed review comments