Cosmetic code changes
Faster /random