I think I did pretty good job tidying it up :) Press the spacebar to switch between the original and the new version
