More changes related to code review, should be ready now.