Agreed.  I was focused on fixing it in the existing style, but probably should have improved it.