Indenting is cool, yo (+ validation fix)