Clean up the source code
Reverse the solution