Correction + cleanup