Cosmetics - avoid namespace polution