Make changes from mareks code review.