Adressed code review feedback.