Reformat code and increase number of rounds