Made fixes based on code review.