272: a little bit of further name space shifting, some coding style cleanup, some code simplification