adressed code review comments.