add short namespaces, cosmetic changes