Changes based on feedback

- remove braces from case blocks
- use Scala's ThreadLocalRandom