Html Extensions code clean-up