Code cleanup in Populate