added TODO, removed old getRandomInt()
formatting adjusted