Addressed all the feedbacks. Please review