Few more formatting fixes (plus regex)