Fixes based on code review
Fixes based on code review