Cleaned up and added randomizer class.