Addressed QA remarks