Random genesis cleanup / comment improvement