Clean up some code, dump percentages aswell