light refactoring, prune dead files, reword docs