Cosmetics to problem 10
Note that it's still REALLY slow :(