Reorder code
Simplify regexp; touchup other code
Touchup messages