THE GIANT COMMIT. Cleaning up the code