Resolved PR/code review comments