improve readability in 'base' modules