better namespacing, comments