Solve P4
Clean-up solution for P5