Address review comments (s'not random, is uniform)