Improved the random questions algorithm.

* Cleaned up the imports a little to remove unused and static imports