v.905 some refactoring

unpolluted global namespace