Cosmetic changes + Fix issue with Pocman::RandomState()