Code style fixes and xmlns="" attribute abstraction.