Formatting Changes, fixed infinite loop on random ?