Improve random generation
Cleanup syntax