Cleanup and added HTML diff to take screenshots of